From: Cosimo Cecchi Date: Thu, 13 Dec 2012 15:39:52 +0000 (-0500) Subject: workspaceThumbnail: handle show/hide when entering/leaving the overview X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~5210 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=d2c6149923f0412c4abc297bb3c2ec53aa761689;p=gnome-shell.git workspaceThumbnail: handle show/hide when entering/leaving the overview Handle this internally, instead of having WorkspacesDisplay show/hide us. https://bugzilla.gnome.org/show_bug.cgi?id=690175 --- diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js index 71ea13d3f..b381dab43 100644 --- a/js/ui/workspaceThumbnail.js +++ b/js/ui/workspaceThumbnail.js @@ -546,6 +546,11 @@ const ThumbnailsBox = new Lang.Class({ this.actor.connect('button-release-event', Lang.bind(this, this._onButtonRelease)); this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent)); + Main.overview.connect('showing', + Lang.bind(this, this._createThumbnails)); + Main.overview.connect('hidden', + Lang.bind(this, this._destroyThumbnails)); + Main.overview.connect('item-drag-begin', Lang.bind(this, this._onDragBegin)); Main.overview.connect('item-drag-end', @@ -733,7 +738,7 @@ const ThumbnailsBox = new Lang.Class({ } }, - show: function() { + _createThumbnails: function() { this._switchWorkspaceNotifyId = global.window_manager.connect('switch-workspace', Lang.bind(this, this._activeWorkspaceChanged)); @@ -765,7 +770,7 @@ const ThumbnailsBox = new Lang.Class({ this._updateSwitcherVisibility(); }, - hide: function() { + _destroyThumbnails: function() { if (this._switchWorkspaceNotifyId > 0) { global.window_manager.disconnect(this._switchWorkspaceNotifyId); this._switchWorkspaceNotifyId = 0; diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js index 781c0e415..5e66c2133 100644 --- a/js/ui/workspacesView.js +++ b/js/ui/workspacesView.js @@ -573,7 +573,6 @@ const WorkspacesDisplay = new Lang.Class({ this._updateZoom(); this._controls.show(); - this._thumbnailsBox.show(); this._updateWorkspacesViews(); @@ -611,7 +610,6 @@ const WorkspacesDisplay = new Lang.Class({ hide: function() { this._controls.hide(); - this._thumbnailsBox.hide(); if (!this._alwaysZoomOut) this.zoomFraction = 0;